Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 14 Jun 2010 11:56:46 +0000 (11:56 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 14 Jun 2010 11:56:46 +0000 (11:56 +0000)
commit6ba8cede1e651753999516f4f583fa8b90923161
tree8451ccac968af0251166d605f1b2d365ea46215d
parent5456fce37dd503b7e43ebc2ff6886d23256380c9
parent8f3a59e3ca95ec0cddec22bf5d8a5d9766338d36
Merge from mainline.